Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
326 commits
Select commit Hold shift + click to select a range
aa47e8a
restore database values
samelamin Jan 14, 2023
b571d2e
new exp migration, updated options for sql
f-gate Jan 16, 2023
77ffe7f
errs
f-gate Jan 17, 2023
e42fe3e
fix migration
f-gate Jan 17, 2023
9d0c5b4
new migration for search, new model fo search wip
f-gate Jan 17, 2023
dba4342
comments so i know where i left off lol
f-gate Jan 17, 2023
be02f8e
completed sql, fixed migrations
f-gate Jan 17, 2023
76075fb
brief post route, call search breif
f-gate Jan 18, 2023
f869720
fixes
f-gate Jan 19, 2023
3a22758
decided to refactor how parameters will be passed after thoughts
f-gate Jan 19, 2023
15c0866
search for max values aswell if max
f-gate Jan 20, 2023
28f5434
need to pull
f-gate Jan 20, 2023
27d14a7
completed fsearch fn
f-gate Jan 20, 2023
c87f71a
brief filter componant, take out of loop
f-gate Jan 20, 2023
625c94b
fix migration file, dynamic data, new seeds, name redo
f-gate Jan 20, 2023
9b98e85
fixed userid in brief table, organised fields in models, improved que…
f-gate Jan 21, 2023
016c87b
sort out seeds, fix up foreign keys, sql fix
f-gate Jan 21, 2023
2520ddd
wired up the post
f-gate Jan 24, 2023
ad1c5bb
fixes to search
f-gate Jan 24, 2023
ade80df
fix: the req body parsing
mshankarrao Jan 24, 2023
84cf883
clean seeds fix sql brackets
f-gate Jan 25, 2023
3d9d013
added limit
f-gate Jan 25, 2023
789a0e1
use case insensitive search
f-gate Jan 25, 2023
6f4ddc8
rebase fixes
samelamin Jan 26, 2023
f56898b
use bigint for budget
samelamin Jan 26, 2023
99fd9bd
dont need to set id, its incremental
samelamin Jan 26, 2023
da5477a
add experience id to the brief
samelamin Jan 26, 2023
4e7e5e7
make skills and industries and array
samelamin Jan 26, 2023
699a380
build briefs
samelamin Jan 26, 2023
973bc53
increment brief submitted
samelamin Jan 26, 2023
2a6102d
Merge pull request #72 from ImbueNetwork/fixes_for_search
samelamin Jan 27, 2023
2551010
css update: new brief page
cuteolaf Jan 28, 2023
4dab8de
update: page structure
cuteolaf Jan 28, 2023
639d84d
feat: freelancer profile
cuteolaf Jan 29, 2023
9bdc1bc
order briefs in desc order
samelamin Jan 29, 2023
9174f8a
feat: edit bio
cuteolaf Jan 29, 2023
c7246b7
add react-country-flag
samelamin Jan 29, 2023
d63cdd9
many to many relationships
samelamin Jan 31, 2023
5b5e8e3
use title instead of display name
samelamin Jan 31, 2023
d3a7df1
freelance many-many, seed data
f-gate Feb 2, 2023
46dd2e8
gitignore
f-gate Feb 2, 2023
407d05c
new fetch all freelancers
f-gate Feb 2, 2023
5ca8497
removed old get all freelancers
f-gate Feb 2, 2023
f45d9a1
refactored old search freelancers by id
f-gate Feb 2, 2023
ae4e7ba
async migrate
f-gate Feb 3, 2023
9130018
fixed seeds
f-gate Feb 3, 2023
a3c4efa
migrate new freelancer page to function component
cuteolaf Feb 4, 2023
754e78d
migrate new brief flow
cuteolaf Feb 4, 2023
f7774ba
Merge pull request #76 from ImbueNetwork/migration/new-brief
samelamin Feb 4, 2023
0b3fe14
Merge pull request #75 from ImbueNetwork/migrate-new-freelancer
samelamin Feb 4, 2023
01e960b
new insert function to allow many to many
f-gate Feb 6, 2023
c62d79a
updated the select to match the freelancer model
f-gate Feb 6, 2023
4abae47
insert statement, fixing up the select sql
f-gate Feb 6, 2023
b3846e9
insert statement is legit
f-gate Feb 7, 2023
af9a2ff
clean
f-gate Feb 7, 2023
edc900d
refactor get all briefs
samelamin Feb 7, 2023
4335ba8
aggregate the ids
f-gate Feb 7, 2023
985bb95
mega generate freelance data
f-gate Feb 5, 2023
7216d25
gotta move middle of debug :/
f-gate Feb 5, 2023
5855a6a
some lolz
f-gate Feb 5, 2023
bf015cd
ignore vscode settings
samelamin Feb 6, 2023
0ea1b4f
math random fi
f-gate Feb 7, 2023
7338917
return skills,languages,services and clients as string arrays
samelamin Feb 7, 2023
c5001c2
proposals
cuteolaf Feb 7, 2023
74fa3e6
login
cuteolaf Feb 7, 2023
30121ad
join
cuteolaf Feb 7, 2023
a18ca73
details
cuteolaf Feb 7, 2023
cdec264
briefs
cuteolaf Feb 7, 2023
374026a
accountChoice
cuteolaf Feb 7, 2023
06078f0
alert
cuteolaf Feb 7, 2023
91ef719
approveMilestone
cuteolaf Feb 7, 2023
ba6ebb2
briefFilter
cuteolaf Feb 7, 2023
500d228
contribute
cuteolaf Feb 7, 2023
be3f3f4
dialogue
cuteolaf Feb 7, 2023
b98bb99
errorDialog
cuteolaf Feb 7, 2023
d73f198
fundingInfo
cuteolaf Feb 7, 2023
ed58998
milestoneItem
cuteolaf Feb 7, 2023
1aab28f
milestones
cuteolaf Feb 7, 2023
b7f66e8
option
cuteolaf Feb 7, 2023
00aeb51
progressbar
cuteolaf Feb 7, 2023
6d89431
tagsInput
cuteolaf Feb 7, 2023
78c8878
textInput
cuteolaf Feb 7, 2023
1789aaf
withdraw
cuteolaf Feb 8, 2023
f1e963d
voteOnMilestone
cuteolaf Feb 8, 2023
0cc4c01
Merge pull request #79 from ImbueNetwork/migration
samelamin Feb 8, 2023
3be5341
organise service
f-gate Feb 8, 2023
194fb15
fixes for flow
samelamin Feb 9, 2023
2db06f8
freelancer dynamic
f-gate Feb 9, 2023
c397322
Merge branch 'imbue-enterprise' into freelancer_api_enterprise_merge
samelamin Feb 9, 2023
9b79d36
merge fixes
samelamin Feb 9, 2023
b334195
remove dupe months
samelamin Feb 9, 2023
07c5818
redirect new freelancers to profile page if user has a freelancer pro…
samelamin Feb 9, 2023
a205c73
remove console log messages
samelamin Feb 9, 2023
75f7c48
fixes for search page
samelamin Feb 9, 2023
5312796
init commit
samelamin Feb 10, 2023
9b39285
second commit
samelamin Feb 13, 2023
0165825
add scope and experience level
samelamin Feb 13, 2023
4835768
updates
cuteolaf Feb 13, 2023
ea836f5
show time ago
samelamin Feb 13, 2023
c4d2e34
put the socials in a componant
f-gate Feb 9, 2023
034b20b
added missign fields
f-gate Feb 10, 2023
f8f5e69
add ratings table
f-gate Feb 10, 2023
d891f4d
spring clean
f-gate Feb 13, 2023
2a98609
brief many to many, more cleaning
f-gate Feb 13, 2023
3be7916
new insert brief with many - many
f-gate Feb 13, 2023
d2dc819
fe fixes, authentication helper
f-gate Feb 14, 2023
988eb2f
fix new freelancer and profile load
f-gate Feb 14, 2023
c27cea4
make things dynamic
f-gate Feb 14, 2023
b409c63
refactor icons
samelamin Feb 15, 2023
645fbe7
mega fixes
f-gate Feb 15, 2023
eacd112
fix up search
f-gate Feb 15, 2023
edd6fcb
Merge branch 'imbue-enterprise' into add_freelancer_api
f-gate Feb 15, 2023
91295dc
Merge branch 'imbue-enterprise' into add_freelancer_api
f-gate Feb 15, 2023
1fe1b33
Merge branch 'add_freelancer_api' into brief_details
samelamin Feb 15, 2023
a9fc939
conflict fixes
samelamin Feb 15, 2023
1e70170
init commit
samelamin Feb 15, 2023
dd7fd7e
add skills and industry seeds
samelamin Feb 15, 2023
1c45d25
Merge branch 'add_freelancer_api' into brief_details
samelamin Feb 15, 2023
c09c02b
fixes re search
samelamin Feb 15, 2023
0d42898
fixes for brief details
samelamin Feb 15, 2023
e2c6200
Merge branch 'brief_details' into add_freelancer_api
samelamin Feb 15, 2023
5ad1ba0
Merge pull request #81 from ImbueNetwork/add_freelancer_api
f-gate Feb 15, 2023
356669b
Merge branch 'imbue-enterprise' into search_freelancers
samelamin Feb 16, 2023
e8986e7
second commit
samelamin Feb 19, 2023
9fc02ec
list many to many relationships as objects
samelamin Feb 19, 2023
7031b99
update route: proposals
cuteolaf Feb 19, 2023
6f0d02d
feat: new project(dashboard for initiators)
cuteolaf Feb 19, 2023
9aefb42
Merge pull request #82 from ImbueNetwork/update-proposal-routes
samelamin Feb 20, 2023
3c0c084
create filters dynamically
samelamin Feb 20, 2023
81aaff6
implement search
samelamin Feb 20, 2023
733ae97
use orWhere
samelamin Feb 20, 2023
1af9ee2
format
samelamin Feb 20, 2023
f73a1a4
simplify sql
f-gate Feb 20, 2023
9cb86c4
exclusive or
f-gate Feb 20, 2023
4deb3c4
fix search brief
samelamin Feb 20, 2023
d4cc80e
simplify freelancer seeds
f-gate Feb 20, 2023
5afb44c
ensure no spaces in usernames
samelamin Feb 20, 2023
6ef219d
adding message box
simrat12 Feb 20, 2023
403cb03
clean up css on search page
samelamin Feb 21, 2023
12ed38d
Merge pull request #84 from ImbueNetwork/search_freelancers
samelamin Feb 21, 2023
2d44df5
redirect to brief details page
samelamin Feb 21, 2023
6c1335d
added spacing, had to comment out styles
Feb 21, 2023
0a809e6
corrected imports
Feb 21, 2023
25578f7
fixing conflicts
Feb 21, 2023
86e48ad
Merge pull request #87 from simrat12/search_freelancers
samelamin Feb 21, 2023
d9b8c6a
Merge branch 'imbue-enterprise' into dashboard-for-initiators
samelamin Feb 21, 2023
3d94971
Merge pull request #83 from ImbueNetwork/dashboard-for-initiators
samelamin Feb 21, 2023
c4a6159
added css
Feb 21, 2023
277730a
fix build
f-gate Feb 23, 2023
9d87c92
moved css to stylesheet
Feb 23, 2023
8397b3a
dependancies
f-gate Feb 24, 2023
65f8820
history package
f-gate Feb 24, 2023
2f44e0c
use yarn, update react dom, p.json update
f-gate Feb 24, 2023
b5a2624
migration to v4 matui
f-gate Feb 24, 2023
fbac0e7
update package lock
f-gate Feb 24, 2023
797233c
added polkadot/util-crypto and p/util to remove warnings
f-gate Feb 24, 2023
97986da
fix: inserting username into the users table when logging in using th…
mshankarrao Feb 24, 2023
fa0a694
Merge pull request #92 from ImbueNetwork/missing-username
samelamin Feb 24, 2023
e57136f
Merge pull request #91 from ImbueNetwork/update-dependancies
samelamin Feb 24, 2023
311dfc5
Merge pull request #88 from simrat12/search_freelancers
samelamin Feb 25, 2023
57c91ad
wip: application form
cuteolaf Feb 26, 2023
2fbf70c
add milestones, payment terms
cuteolaf Mar 2, 2023
d62ba92
API wiring for apply brief application UI page to insert project to t…
aalavanthan18 Mar 6, 2023
949c467
style updates: brief details page
cuteolaf Mar 7, 2023
13594c1
bug fix: get brief id from route
cuteolaf Mar 7, 2023
2d3a7ed
update: brief insight
cuteolaf Mar 7, 2023
8fef77b
feat: review applicants page
cuteolaf Mar 7, 2023
6f76109
getstream real time messaging
samelamin-discovery Mar 8, 2023
b18f463
pr comments
samelamin-discovery Mar 8, 2023
d567f33
Merge pull request #96 from ImbueNetwork/real_time_messaging
samelamin Mar 8, 2023
e82f086
add preview application
samelamin Mar 9, 2023
dcf8155
css fixes
samelamin Mar 9, 2023
69913dd
Merge branch 'imbue-enterprise' into cuteolaf/review-applicants
samelamin Mar 9, 2023
8e5ad80
Merge pull request #95 from ImbueNetwork/cuteolaf/review-applicants
samelamin Mar 9, 2023
f971d1e
fix paths
samelamin Mar 9, 2023
5abd499
hire brief owner
samelamin Mar 10, 2023
46ba035
Merge pull request #97 from ImbueNetwork/hire_team_messaging
samelamin Mar 10, 2023
26a4125
edit applications
samelamin Mar 10, 2023
7e2434b
Merge pull request #98 from ImbueNetwork/edit_brief_application
samelamin Mar 10, 2023
236b006
fix bug with updating currency
samelamin Mar 10, 2023
41569be
Freelancer profile edits + authentication (#90)
f-gate Mar 11, 2023
377f0c6
remove console log
samelamin Mar 12, 2023
2a34e93
add: initial sample test for freelancer component (#94)
mshankarrao Mar 14, 2023
c9e6c73
list brief applications (#99)
samelamin Mar 14, 2023
e2ed299
fix for tests
samelamin Mar 14, 2023
73ca567
Hirer dashboard (#100)
samelamin Mar 15, 2023
6861204
fix for build
samelamin Mar 15, 2023
caf3d6a
create user on sign in
samelamin Mar 15, 2023
99ae677
done channellist design
ssani7 Mar 17, 2023
b4d3043
basic styling done
ssani7 Mar 17, 2023
e71b3e0
basic styling done
ssani7 Mar 17, 2023
db34f72
Sani branch (#103)
samelamin Mar 20, 2023
ab5d3b1
Merge remote-tracking branch 'upstream/imbue-enterprise' into imbue-e…
ssani7 Mar 20, 2023
771a008
added test cases for briefs component
vadik0101 Mar 20, 2023
4fed632
fix: remove unnecessary code
vadik0101 Mar 20, 2023
4555789
refactor
vadik0101 Mar 20, 2023
d9bee28
link users with addresses (#108)
samelamin Mar 21, 2023
fed76a9
refactor: variable names
vadik0101 Mar 21, 2023
0cf92bd
add freelancer to the application preview page
samelamin Mar 21, 2023
6579c5d
Merge pull request #106 from mastercodemarshal/michael/add-test-brief…
cuteolaf Mar 21, 2023
03952a7
testing push
ssani7 Mar 21, 2023
afeca6d
Merge remote-tracking branch 'upstream/imbue-enterprise' into imbue-e…
ssani7 Mar 21, 2023
2404924
styled application-preview
ssani7 Mar 21, 2023
01b0807
styling finished for application-preview
ssani7 Mar 21, 2023
034377a
added mui modal
ssani7 Mar 21, 2023
be1c3f9
add application status id
samelamin Mar 21, 2023
3137cbd
test cases for new-brief, added validation for freelancers and fixed …
mshankarrao Mar 22, 2023
71eb522
popup first page ready
ssani7 Mar 22, 2023
1d6b4ac
finished popup
ssani7 Mar 22, 2023
7b53656
Merge branch 'imbue-enterprise' into imbue-enterprise
ssani7 Mar 22, 2023
f9d7322
Merge pull request #109 from ssani7/imbue-enterprise
ssani7 Mar 22, 2023
eff8857
syled dashboard chat
ssani7 Mar 23, 2023
8576312
added chat popup component
ssani7 Mar 24, 2023
55c11c8
added new chat popup and removed bootstrap styles
ssani7 Mar 24, 2023
387deb6
complete brief details page
ssani7 Mar 25, 2023
ed31bba
finish styling application list page
ssani7 Mar 25, 2023
4e70930
created nav bar
ssani7 Mar 26, 2023
dabe0b8
finished dashboard design
ssani7 Mar 27, 2023
bc079a6
removed table
ssani7 Mar 28, 2023
968c15b
styled chat popup and other pages
ssani7 Mar 29, 2023
efc5104
reviewed changes on the application page
ssani7 Mar 30, 2023
ceebdc8
moved inline styles to css modules
ssani7 Mar 30, 2023
afa449d
Merge pull request #112 from ssani7/imbue-enterprise
cuteolaf Mar 30, 2023
b4824ba
username fixed and css variables added (#113)
ssani7 Mar 30, 2023
c9f9af4
Complete client view with open briefs with application lists and proj…
ssani7 Apr 1, 2023
61584a7
Hire freelancer (#115)
samelamin Apr 3, 2023
e2288bb
set status at hiring
samelamin Apr 3, 2023
eea5516
fixed the redirect issue
samelamin Apr 3, 2023
1996d6b
list freelancer applications
samelamin Apr 3, 2023
efaeb93
show action buttons when empty
samelamin Apr 3, 2023
6bab16d
hide legacy new project
samelamin Apr 3, 2023
856fa62
Loading screen, 0 proposal bug fix, message popup and skeleton loadin…
ssani7 Apr 3, 2023
417cbd7
add hire + reject buttons
samelamin Apr 4, 2023
b3a13f8
redirect to new freelancer if not available
samelamin Apr 4, 2023
0085c9e
handle states
samelamin Apr 4, 2023
8330312
fix for tests
samelamin Apr 4, 2023
7edef4b
use keys in the backend
samelamin Apr 4, 2023
c43c10b
typo
samelamin Apr 4, 2023
c7ead17
Dashboard bug fixed and modal height added (#117)
ssani7 Apr 4, 2023
bc15ed9
fix migration down
samelamin Apr 4, 2023
6d2fc39
fix for chat
samelamin Apr 4, 2023
a927b1f
fix for builds (#118)
samelamin Apr 5, 2023
244848d
Moved css files from public to styles (#119)
ssani7 Apr 5, 2023
d82221c
clean default to build only
samelamin Apr 5, 2023
abfc95a
reduce file sizes
samelamin Apr 6, 2023
45a28de
init commit
samelamin Apr 6, 2023
c45a4fa
added filehandler service for uploading and dowloding files, implemen…
mshankarrao Apr 12, 2023
92ccc40
removed the duplicated fields based on the review comments
mshankarrao Apr 13, 2023
7c31497
Merge pull request #110 from ImbueNetwork/file-upload-api
cuteolaf Apr 13, 2023
d1bc29e
added the uploads folder to store the files (#120)
mshankarrao Apr 13, 2023
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ api/build/*
# vim
*.swp
*.swo
.vscode

.DS_Store

.vscode/
./.vscode
.idea/
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"tabWidth": 4,
"useTabs": false,
"singleQuote": false,
"trailingComma": "es5"
}
3 changes: 0 additions & 3 deletions .vscode/settings.json

This file was deleted.

28 changes: 28 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,31 @@ yarn start
```

which starts webpack in "watch" mode. This is connected to the running nginx server via the docker-compose `volumes` directive, which is tied to the `./web/dist` directory (where webpack outputs its bundle).


## Testing the frontened components

### Running all the unit tests at once
You can run the unit test for the components by going to the api directory by ```cd api```
And once inside the api directory run

```bash
yarn test
```

It will run all the test cases and you will see the results in the terminal

### Testing the individual components
If you want to run the test cases for a specific component then you can run

```bash
yarn test <component_name> for example yarn test Freelancer
```

### Testing the individual test inside any component
If you want to run a single test case inside a component then you can run

```bash
yarn test -t <test_name> for example yarn test -t "should render the component"
```

4 changes: 3 additions & 1 deletion api/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
src/**/*.js$
!build/
.env
public/lib
*.snap
public/lib
./.vscode/*
1 change: 1 addition & 0 deletions api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM node:16-slim

WORKDIR /api
ARG NODE_ENV

RUN apt-get update
RUN apt-get install -y make
Expand Down
43 changes: 19 additions & 24 deletions api/Makefile
Original file line number Diff line number Diff line change
@@ -1,59 +1,54 @@
DBDIR := "./src/backend/db"


all: clean build
all: build

clean: clean_build clean_deps
clean: clean_build
clean_build:
rm -rf -- build/*.js build/*/
rm -rf -- build/*.js build/*/ public/lib/* node_modules/ rm *.lock
clean_deps:
rm -rf node_modules/

node_modules:
yarn install

build: node_modules
clean_cache:
yarn cache clean
npm cache clean -f
cmd: db_up
node build/index.js
build: install
yarn build/frontend
yarn build/backend
yarn build/legacy
# yarn build/legacy
mkdir -p ./build/views
mkdir -p ./build/public
cp ./src/backend/views/* ./build/views/
cp -r ./public/* ./build/public/

install:
yarn install

migrate: migrate_latest

migrate_latest: node_modules
migrate_latest: install
yarn run knex --cwd ${DBDIR} migrate:latest

migrate_up: node_modules
migrate_up: install
yarn run knex --cwd ${DBDIR} migrate:up

migrate_down: node_modules
migrate_down: install
yarn run knex --cwd ${DBDIR} migrate:down

migrate_reset: node_modules
migrate_reset: install
/bin/bash -c '\
while [ "x$${OUT/Already at the base migration}" == "x$${OUT}" ]; do\
export OUT="$$(yarn run knex --cwd ${DBDIR} migrate:down)";\
echo "$$OUT";\
done;\
'

seed:
yarn run knex --cwd ${DBDIR} seed:run

db_up: migrate seed
db_up: migrate

db_down: migrate_reset

cmd: db_up
node build/index.js

start: db_up
yarn start

.PHONY: all clean clean_build clean_deps build \
migrate migrate_latest migrate_up migrate_down migrate_reset \
seed db_up db_down \
cmd start
yarn start
6 changes: 6 additions & 0 deletions api/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
moduleNameMapper: {
'\\.(css|less)$': '<rootDir>/src/frontend/tests/__mocks__/styleMock.js',
},
testEnvironment: 'jsdom',
};
Loading