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 #33

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open

Dev #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
403ea08
base boxes for gallery setup
Apr 26, 2021
88a8d61
add dev branch
nicole-m-martin Apr 26, 2021
9a7e925
Merge branch 'katrina' of https://github.com/st-ART-up/the-canvas int…
nicole-m-martin Apr 26, 2021
b6ad868
add basic layout of canvas and buttons, first draft
nicole-m-martin Apr 26, 2021
46d5a84
updated layout for terminal size and more colors (#2)
sorayamajdolashrafi Apr 26, 2021
35cdf6f
Kat dev (#3)
kat-sauma Apr 27, 2021
9b49b48
draw function (#7)
sorayamajdolashrafi Apr 27, 2021
88c53a6
Clear button (#8)
sorayamajdolashrafi Apr 27, 2021
50b8470
add Eraser and Button Size click handlers (#9)
nicole-m-martin Apr 27, 2021
d2eb227
click handling added to color palette (#10)
KatrinaCloyd Apr 27, 2021
f8f2031
Kat dev (#11)
kat-sauma Apr 27, 2021
969e58d
Nicole branch (#13)
nicole-m-martin Apr 27, 2021
893fdba
megafile restructure
sorayamajdolashrafi Apr 27, 2021
6dd6ed5
variables working properly in color panel! (#15)
KatrinaCloyd Apr 28, 2021
2a5f687
Kat dev (#16)
kat-sauma Apr 28, 2021
b7cf758
made picture save endpoint work.
Apr 28, 2021
e54c8f2
working on oauth flow.
Apr 28, 2021
db3a429
Katrina (#19)
KatrinaCloyd Apr 29, 2021
5ff7ec3
Erich (#20)
erichsauer Apr 29, 2021
4cd25d1
Hot mess (#21)
kat-sauma Apr 29, 2021
0359f36
Mega refactor (#23)
sorayamajdolashrafi Apr 29, 2021
aa99bf1
added white to palette (#24)
KatrinaCloyd Apr 29, 2021
a7db99f
add dev branch (#1) (#25)
nicole-m-martin Apr 29, 2021
b2ede4f
Erich (#28)
erichsauer Apr 30, 2021
c134dfc
Nicole branch (#29)
nicole-m-martin Apr 30, 2021
0f9fab8
working on endpoints. (#30)
erichsauer Apr 30, 2021
255b1a5
Nonsense (#31)
sorayamajdolashrafi Apr 30, 2021
29b44c4
Erich (#32)
erichsauer Apr 30, 2021
8445a2c
add dev branch (#1) (#35)
erichsauer Apr 30, 2021
af4a462
Kat (#38)
kat-sauma Apr 30, 2021
b670441
Steph (#39)
erichsauer Apr 30, 2021
a4fe5aa
Add browser window close, login logout buttons switch (#36)
KatrinaCloyd Apr 30, 2021
aad4529
Erich (#41)
erichsauer Apr 30, 2021
c19afdf
fix file path on image save and imgur (#40)
KatrinaCloyd Apr 30, 2021
64b4ecd
Detect os (#42)
sorayamajdolashrafi Apr 30, 2021
629515d
Update README.md
sorayamajdolashrafi Jun 24, 2021
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
76 changes: 76 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"parserOptions": {
"ecmaVersion": 12,
"sourceType": "module",
"requireConfigFile": false,
"babelOptions": {
"plugins": ["@babel/plugin-syntax-class-properties"]
}
},
"parser": "@babel/eslint-parser",
"env": {
"es6": true,
"node": true,
"jest": true
},
"extends": ["eslint:recommended"],
"rules": {
"no-console": "warn",
"indent": [
"error",
2,
{
"SwitchCase": 1
}
],
"quotes": ["error", "single"],
"semi": ["error", "always"],
"space-in-parens": ["error"],
"space-infix-ops": "error",
"object-curly-spacing": ["error", "always"],
"comma-spacing": "error",
"space-before-function-paren": [
"error",
{
"async-arrow": "always",
"anonymous": "never",
"named": "never"
}
],
"eol-last": ["error", "always"],
"keyword-spacing": [
"error",
{
"before": true,
"after": true,
"overrides": {
"do": {
"after": false
},
"for": {
"after": false
},
"if": {
"after": false
},
"switch": {
"after": false
},
"while": {
"after": false
},
"catch": {
"after": false
}
}
}
],
"arrow-spacing": ["error", { "before": true, "after": true }],
"array-bracket-spacing": "error",
"prefer-const": "error",
"no-var": "error",
"rest-spread-spacing": "error",
"prefer-arrow-callback": "error",
"object-shorthand": ["error", "always"]
}
}
20 changes: 20 additions & 0 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Jest Tests

on: [push]
jobs:
build:
runs-on: ubuntu-latest
container: node:latest
services:
postgres:
image: postgres
env:
POSTGRES_USER: alchemy
POSTGRES_PASSWORD: alchemy
steps:
- uses: actions/checkout@v2
- run: npm ci
- run: npm test
env:
CI: true
DATABASE_URL: postgres://alchemy:alchemy@postgres:5432/alchemy
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules
.env
dist
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"tabWidth": 2,
"useTabs": false,
"semi": true,
"singleQuote": true,
"printWidth": 80
}
45 changes: 44 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,44 @@
# the-canvas
# Pixel Pusher! by st-ART-up.

Pixel Pusher is a terminal-based drawing art app that allows users to unleash thier creativity in an easy and fun way, using only back-end technologies. This is the canvas side of the app where the user can draw with clicks of thier mouse.

https://www.npmjs.com/package/@st-art-up/pixel-pusher

### Libraries
Node.js | Blessed | Chalk | cFonts | Express | Supertest/Jest

### The Original Pixel Pushers
[Katrina](https://github.com/KatrinaCloyd) | [Brandon](https://github.com/bperard) | [Kat](https://github.com/kat-sauma) | [Vance](https://github.com/Vance-M) | [Nicole](https://github.com/nicole-m-martin) | [Erich](https://github.com/erichsauer) | [Soraya](https://github.com/sorayabenson) | [Steph](https://github.com/stephen-leisy)

### Instructions:
Pixel Pusher has 2 parts to explore. To make art visit the canvas, and to view art visit the gallery.
#### Canvas:
##### terminal command: npx -p @st-art-up/pixel-pusher@latest canvas
Choose your favorite colors and click on the canvas with your mouse to draw.
Brush sizes and erasers are on the left, pick the size you need.
Add some fun text (a poem, perhaps?) on the canvas by using the bottom yellow input bar.
To start over click the clear button.

The optimal terminal size is 150x50

Mac users: To save, first click the login button to use your github account. Once you're logged in click the save button to take a screenshot. Next, click the upload button to send your art to the gallery.

Windows users: Sad story... you can draw in... Ubuntu, but the upload is not ready for version 1.0. Please screenshot your art with the PrtScn key to save and cherish forever.

#### Gallery:
##### terminal command: npx -p @st-art-up/pixel-pusher@latest gallery
Use the arrow keys to navigate the menu.

To browse the gallery select 'show me the art!':<br>
Select 'view all drawings' to see all the art saved by fellow pixel pushers. Select 'view image carousel' to see one random image!

To view your own art work select 'log in and edit my drawings':<br>
After loging in you can select 'view my drawings' to revisit all your masterpieces. You can also delete a piece you no longer want in your gallery by selecting 'delete a drawing by its id'. Just enter the corresponding id of the art you want to trash, press enter, and it is gone forever.

#### App Images:
Title Screen:
<img width="1343" alt="title" src="https://user-images.githubusercontent.com/71411431/117599464-b896bb80-b0fe-11eb-8183-3dce37a30d64.png">


Canvas:
<img width="1356" alt="canvas" src="https://user-images.githubusercontent.com/71411431/117599256-4f16ad00-b0fe-11eb-87e9-ffb49c38788f.png">
11 changes: 11 additions & 0 deletions __tests__/utils.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// const imgur = require('../utils/imgur-utils');

describe('utils test block', () => {
// it('inserts a picture to the imgur API and returns a URL', async () => {
// const actual = await imgur();
// expect(actual).toEqual(expect.stringContaining('http'));
// });
it('riggs the test', async () => {
expect(true).toEqual(true);
});
});
Empty file added delete.json
Empty file.
Loading