Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev bootstrap #2

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
15e712d
changed readme, added git ignores
cfuess-student Feb 9, 2018
d503401
initial commit
Feb 9, 2018
f070ae1
updated image
cfuess-student Feb 9, 2018
de90f3c
Add Category vue
McLeopold Feb 9, 2018
f901c35
installed axios, started joke
cfuess-student Feb 9, 2018
e10e071
modified page to show random joke
cfuess-student Feb 9, 2018
e2a0793
added random joke refresh to joke.vue
thaxor Feb 9, 2018
5cfdf07
added toggle button for random norris jokes
thaxor Feb 10, 2018
3bf122d
Update joke view for linter
McLeopold Feb 10, 2018
f9ea523
Get categories from api
McLeopold Feb 10, 2018
c693d11
Remove boilerplate code
McLeopold Feb 10, 2018
b774d5b
renamed helloworld to home.
cfuess-student Feb 11, 2018
a098cbf
made toggles have consistant colors
cfuess-student Feb 11, 2018
097d2e8
Rename HelloWorld.vue to Home.vue
McLeopold Feb 11, 2018
00311e0
Update Home.vue
McLeopold Feb 11, 2018
2899123
made toggles have consistant colors
cfuess-student Feb 11, 2018
55109be
Add bootstrap-vue to dependencies
McLeopold Feb 11, 2018
c658358
Add bootstrap 4 to project
McLeopold Feb 11, 2018
dc77bff
Made background black, added js-cookie to packages,
cfuess-student Feb 11, 2018
976dffc
Modified CSS, made black background go all the way to the bottom.
cfuess-student Feb 12, 2018
62e1889
Added Local Mode so we don't have to be online
cfuess-student Feb 15, 2018
bf3caf2
Forgot these
cfuess-student Feb 15, 2018
d453fa2
show selected catagories under toggles, remove comments in joke.vue
cfuess-student Feb 15, 2018
eec5c4a
selected categories being passed to joke
cfuess-student Feb 17, 2018
223ed03
added gitlost
cfuess-student Feb 17, 2018
2cfc01c
Renamed the joke file again
cfuess-student Feb 18, 2018
6b51e85
renamed helloworld to home.
cfuess-student Feb 11, 2018
ebd9c0c
made toggles have consistant colors
cfuess-student Feb 11, 2018
47bd859
Added accidently deleted Joke.vue
cfuess-student Feb 18, 2018
386e140
Added Joke.vue again?
cfuess-student Feb 18, 2018
889d5f4
Add bootstrap-vue to dependencies
McLeopold Feb 11, 2018
02f91be
Add bootstrap 4 to project
McLeopold Feb 11, 2018
bff2276
Made background black, added js-cookie to packages,
cfuess-student Feb 11, 2018
78f3c5a
added gitlost, renamed joke.vue to Joke.vue again
cfuess-student Feb 19, 2018
d13a2f2
Merge branch 'master' into dev-bootstrap
cfuess-student Feb 19, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
261 changes: 261 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,261 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
project.fragment.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
#*.pubxml
*.publishproj

# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe
paket-files/

# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml

# CodeRush
.cr/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Join us on SSDUG Slack [![Join us](https://webtasks.iamnotmyself.com/notmyself/s
## "Grading"
Points will be given for
* Code cleanliness
* FUNctionality 😎
* FUNctionality 😎😎

## Implementations

Expand Down
2 changes: 2 additions & 0 deletions gitlost/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
web/viz.js
5 changes: 5 additions & 0 deletions gitlost/bin/gitgraph.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
var gitlost = require('../lib/graph');
settings = JSON.parse(process.argv.slice(2).join(' ') || '{}');
gitlost.graph(settings).then(function (dot) {
console.log(dot);
})
5 changes: 5 additions & 0 deletions gitlost/bin/gitlost.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
var opn = require('opn');
var server = require("../lib/server.js");

opn('http://localhost:6776', {app: 'chrome'});
server.listen(6776);
Loading