merge develop #104

arminpatel · 2023-11-18T13:20:07Z

Overview

This PR fixes or fixes part of #[fill_in_number_here].
This PR does the following: [Explain here what your PR does and why]

Essential Checklist

The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
"Allow edits from maintainers" is checked. (See here for instructions on how to enable it.)
The PR is made from a branch that's not called "main/master".

Proof that changes are correct

PR Pointers

If you need a review or an answer to a question, and don't have permissions to assign people, leave a comment like the following: "{{Question/comment}} @{{reviewer_username}} PTAL".
Never force push. If you do, your PR will be closed.

…-bitbyte#34)

* fix: move dot files to frontend * feat(core): backend setup * fix(docs): update readme for backend

… .gitignore (bsoc-bitbyte#41) * added global gitignore and build script for run and setup * Using venv through shell * updated build.py

…yte#44) * feat(backend): add lint and build workflow and rename core * change file structure * fix(backend): minor fixes

* updated requirements * created account app * updated setting.py * updated url to incorporate routes * accounts directory changed * duplicacy of core removed * Removed username field * removed routers

* fix(backend): fix account and build file * fix linting * remove json_api package * fix(backend): add address field to account model

* feat(backend): add endpoints for account * fix linting and build errors * fix linting and build errors

* Merge branch develop into Priyansh61/product-model * Done requested changes

* docker initialised: backend * changes * changes

Signed-off-by: Priyansh61 <[email protected]>

* Added Evnet Model Signed-off-by: Priyansh61 <[email protected]> * Added Tickets App Signed-off-by: Priyansh61 <[email protected]> * Added Event Form Model Signed-off-by: Priyansh61 <[email protected]> * minor fixes * Update models.py --------- Signed-off-by: Priyansh61 <[email protected]> Co-authored-by: Armin Patel <[email protected]>

Signed-off-by: Priyansh61 <[email protected]>

…-bitbyte#34)

* fix: move dot files to frontend * feat(core): backend setup * fix(docs): update readme for backend

… .gitignore (bsoc-bitbyte#41) * added global gitignore and build script for run and setup * Using venv through shell * updated build.py

…yte#44) * feat(backend): add lint and build workflow and rename core * change file structure * fix(backend): minor fixes

* updated requirements * created account app * updated setting.py * updated url to incorporate routes * accounts directory changed * duplicacy of core removed * Removed username field * removed routers

netlify · 2023-11-18T13:20:12Z

✅ Deploy Preview for merch-site canceled.

Name	Link
🔨 Latest commit	`1f297fa`
🔍 Latest deploy log	https://app.netlify.com/sites/merch-site/deploys/656eeb3464a3840008699ee9

Priyansh61 · 2023-11-18T16:27:15Z

@arminpatel @ChaudharyRaman shouldn't docker-compose.yml inside the backend folder. Rest everything LGTM

ChaudharyRaman · 2023-11-18T19:16:33Z

@Priyansh61 it will be useful if we were to run multi container like frontend on a different container

Priyansh61 · 2023-12-05T09:02:46Z

@arminpatel merge the pr

arminpatel and others added 28 commits June 24, 2023 01:47

chore(global): change file structure to accommodate for backend (bsoc…

b799137

…-bitbyte#34)

feat(core): backend setup (bsoc-bitbyte#38)

9533ed0

* fix: move dot files to frontend * feat(core): backend setup * fix(docs): update readme for backend

fix(backend): move .env.template and add requirements.txt

c54a43a

fix: remove duplicate .env.template

a300287

build : Added build.py to setup the backend and incorporated a global…

ac08f91

… .gitignore (bsoc-bitbyte#41) * added global gitignore and build script for run and setup * Using venv through shell * updated build.py

build : updated build.py

d86dcbb

feat(backend): add lint and build workflow and rename core (bsoc-bitb…

9990497

…yte#44) * feat(backend): add lint and build workflow and rename core * change file structure * fix(backend): minor fixes

feat(backend): setup authentication (bsoc-bitbyte#46)

56ad858

feat(backend) : added account models (bsoc-bitbyte#50)

15b7fd8

* updated requirements * created account app * updated setting.py * updated url to incorporate routes * accounts directory changed * duplicacy of core removed * Removed username field * removed routers

fix(backend): linting account and build file (bsoc-bitbyte#79)

7b56a27

* fix(backend): fix account and build file * fix linting * remove json_api package * fix(backend): add address field to account model

feat(backend): add endpoints for accounts (bsoc-bitbyte#82)

9f051c8

* feat(backend): add endpoints for account * fix linting and build errors * fix linting and build errors

feat (backend) : Added Product Models (bsoc-bitbyte#87)

18dbbd7

* Merge branch develop into Priyansh61/product-model * Done requested changes

Feat : docker initialised : backend (bsoc-bitbyte#101)

ab0c789

* docker initialised: backend * changes * changes

Feat : Added Event Model (bsoc-bitbyte#102)

3e62285

Signed-off-by: Priyansh61 <[email protected]>

Added Tickets App

2263a69

Signed-off-by: Priyansh61 <[email protected]>

Added Event Form Model

175c283

Signed-off-by: Priyansh61 <[email protected]>

chore(global): change file structure to accommodate for backend (bsoc…

82ce067

…-bitbyte#34)

feat(core): backend setup (bsoc-bitbyte#38)

734bab9

* fix: move dot files to frontend * feat(core): backend setup * fix(docs): update readme for backend

fix(backend): move .env.template and add requirements.txt

3e33583

fix: remove duplicate .env.template

3c7f31e

build : Added build.py to setup the backend and incorporated a global…

4216e88

… .gitignore (bsoc-bitbyte#41) * added global gitignore and build script for run and setup * Using venv through shell * updated build.py

build : updated build.py

7bb06cb

feat(backend): add lint and build workflow and rename core (bsoc-bitb…

43678f1

…yte#44) * feat(backend): add lint and build workflow and rename core * change file structure * fix(backend): minor fixes

feat(backend): setup authentication (bsoc-bitbyte#46)

3c77f22

feat(backend) : added account models (bsoc-bitbyte#50)

db8bf93

* updated requirements * created account app * updated setting.py * updated url to incorporate routes * accounts directory changed * duplicacy of core removed * Removed username field * removed routers

fix(backend): fix account and build file

7e96b2a

merge commit for develop

447a381

arminpatel requested a review from Priyansh61 November 18, 2023 13:20

arminpatel added 3 commits November 19, 2023 13:33

move dockerfile inside backend

04b16d7

minor file movements

887620d

minor fixes

d940b83

move docker files to root

1f297fa

arminpatel merged commit 0936049 into bsoc-bitbyte:main Dec 5, 2023
5 of 6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge develop #104

merge develop #104

arminpatel commented Nov 18, 2023 •

edited

Loading

netlify bot commented Nov 18, 2023 •

edited

Loading

Priyansh61 commented Nov 18, 2023

ChaudharyRaman commented Nov 18, 2023

Priyansh61 commented Dec 5, 2023

merge develop #104

merge develop #104

Conversation

arminpatel commented Nov 18, 2023 • edited Loading

Overview

Essential Checklist

Proof that changes are correct

PR Pointers

netlify bot commented Nov 18, 2023 • edited Loading

✅ Deploy Preview for merch-site canceled.

Priyansh61 commented Nov 18, 2023

ChaudharyRaman commented Nov 18, 2023

Priyansh61 commented Dec 5, 2023

arminpatel commented Nov 18, 2023 •

edited

Loading

netlify bot commented Nov 18, 2023 •

edited

Loading