-
Notifications
You must be signed in to change notification settings - Fork 23
Canvas Implementation #27
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
Closed
Closed
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
4894c7c
Add files via upload
21tcoelho e4cc377
Add files via upload
21tcoelho be7356c
Create .env
21tcoelho 1abd8c5
Update HomeView.vue
21tcoelho e4a8fef
Update .gitignore
21tcoelho ba00e1a
Update .gitignore
21tcoelho 84688ca
Update .env
21tcoelho 1117e24
Update HomeView.vue
21tcoelho 5ee1b69
Update NewBadge.vue
21tcoelho aed8491
Update NewBadge.vue
21tcoelho 8329e96
Update NewBadge.vue
21tcoelho 07c174a
Update HomeView.vue
21tcoelho 27bc8e8
Update HomeView.vue
21tcoelho c401ca6
Update HomeView.vue
21tcoelho 6c23bb3
Create BadgeButton.vue
21tcoelho a2a82d1
Update HomeView.vue
21tcoelho 444802d
Update BadgeButton.vue
21tcoelho ebc2dc5
Delete BadgeButton.vue
21tcoelho 6e0711b
Update HomeView.vue
21tcoelho 5bcd88a
Updated UI
21tcoelho 3e49786
Delete tasks.vs.json
21tcoelho 056d013
Delete .suo
21tcoelho d24ed4c
Delete VSWorkspaceState.json
21tcoelho 352268d
Delete slnx.sqlite
21tcoelho File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| VUE_APP_CLIENT_ID= 581cd1a745e24eef5fef | ||
| VUE_APP_CLIENT_SECRET= e94daf563c49e2d0526106d558b1209756d25d31 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <template> | ||
| <div> | ||
| <v-layout justify-center row> | ||
| <v-btn-group class = "buttongroup" | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. v-btn-group has no closing tag giving an error at console on execution. |
||
| <v-btn class = "button"> | ||
| <i class="fas fa-mouse-pointer"></i> | ||
| </v-btn> | ||
| <v-btn class = "button"> | ||
| <i class="fas fa-pen"></i> | ||
| </v-btn> | ||
| <v-btn class = "button"> | ||
| <i class="fas fa-eraser"></i> | ||
| </v-btn> | ||
| <v-btn class = "button"> | ||
| <i class="fas fa-square"></i> | ||
| </v-btn> | ||
| <v-btn class = "button"> | ||
| <i class="fas fa-circle"></i> | ||
| </v-btn> | ||
| <v-btn class = "button"> | ||
| <i class="fas fa-magic"></i> | ||
| </v-btn> | ||
| <v-btn>T</v-btn> | ||
| </v-layout> | ||
| </div> | ||
| </template> | ||
|
|
||
| <style> | ||
| .button { | ||
| padding: 0px, 5px; | ||
| } | ||
| </style> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,49 @@ | ||
| import Vue from 'vue'; | ||
| import Router from 'vue-router'; | ||
| import AuthView from './views/AuthView'; | ||
| import HomeView from './views/HomeView'; | ||
| import OrgView from './views/OrgView'; | ||
| import AuthService from './services/authService'; | ||
|
|
||
| Vue.use(Router); | ||
|
|
||
| const authService = new AuthService(); | ||
|
|
||
| export default new Router({ | ||
| routes: [ | ||
| { | ||
| path: '', | ||
| redirect: 'auth' | ||
| }, | ||
| { | ||
| path: '/auth', | ||
| name: 'authView', | ||
| component: AuthView | ||
| }, | ||
| { | ||
| path: '/home', | ||
| name: 'homeView', | ||
| component: HomeView, | ||
| beforeEnter: (to, from, next) => { | ||
| next(authService.isLoggedIn()); | ||
| } | ||
| }, | ||
| { | ||
| path: '/org/:name', | ||
| name: 'orgView', | ||
| component: OrgView, | ||
| beforeEnter: (to, from, next) => { | ||
| next(authService.isLoggedIn()); | ||
| } | ||
| } | ||
| ] | ||
| }); | ||
| import Vue from 'vue'; | ||
| import Router from 'vue-router'; | ||
| import AuthView from './views/AuthView'; | ||
| import HomeView from './views/HomeView'; | ||
| import OrgView from './views/OrgView'; | ||
| import NewBadge from './views/NewBadge'; | ||
| import AuthService from './services/authService'; | ||
|
|
||
| Vue.use(Router); | ||
|
|
||
| const authService = new AuthService(); | ||
|
|
||
| export default new Router({ | ||
| routes: [ | ||
| { | ||
| path: '', | ||
| redirect: 'auth' | ||
| }, | ||
| { | ||
| path: '/auth', | ||
| name: 'authView', | ||
| component: AuthView | ||
| }, | ||
| { | ||
| path: '/home', | ||
| name: 'homeView', | ||
| component: HomeView, | ||
| beforeEnter: (to, from, next) => { | ||
| next(authService.isLoggedIn()); | ||
| } | ||
| }, | ||
| { | ||
| path:'/newBadge', | ||
| name: 'newBadge', | ||
| component: NewBadge, | ||
| beforeEnter: (to, from, next) => { | ||
| next(authService.isLoggedIn()); | ||
| } | ||
| }, | ||
| { | ||
| path: '/org/:name', | ||
| name: 'orgView', | ||
| component: OrgView, | ||
| beforeEnter: (to, from, next) => { | ||
| next(authService.isLoggedIn()); | ||
| }, | ||
| } | ||
| ] | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| <template> | ||
| <body style ="background-image: url('https://png.pngtree.com/thumb_back/fh260/background/20190331/pngtree-vector-white-abstract-background-design-templates-collection-wit-image_94438.jpg'); background-repeat: repeat;"> | ||
| <div class = "mt-5 orgs"> | ||
| <h1 style ="font-family: georgia; font-size: 45px;"> | ||
| <center> | ||
| <b>Create a New Badge!</b> | ||
| </center> | ||
| </h1> | ||
| <h2 style ="margin-bottom: 30px; font-family: georgia; font-size: 25px;"> | ||
| <center> | ||
| <b>Design your own badge for your organization.</b> | ||
| </center> | ||
| </h2> | ||
| <Buttons/> | ||
| <v-layout style="margin: 10px;" justify-center=""> | ||
| <canvas id = "newCanvas" width="900" height="600"> | ||
| </canvas> | ||
| </v-layout> | ||
| </div> | ||
| </body> | ||
| </template> | ||
|
|
||
| <script> | ||
| import Buttons from '../components/newBadge/Buttons'; | ||
|
|
||
| export default { | ||
| name: 'NewBadge', | ||
| components: { | ||
| Buttons | ||
| } | ||
| } | ||
|
|
||
| function draw() { | ||
| var canvas = document.getElementById('newCanvas'); | ||
| if (canvas.getContext) { | ||
| var ctx = newCanvas.getContext('2d'); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this shall be canvas not newCanvas here. |
||
| } | ||
| } | ||
| </script> | ||
|
|
||
| <style> | ||
| canvas { | ||
| background-color: white; | ||
| margin: auto; | ||
| display: block; | ||
| border: 2px solid gray; | ||
| border-radius: 2px; | ||
| } | ||
|
|
||
| .title { | ||
| padding: 20px; | ||
| font-size: 80px; | ||
| } | ||
| </style> | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need push .env file to GitHub put it in .gitignore.