Skip to content

Commit

Permalink
Merge pull request #45 from district0x/qa
Browse files Browse the repository at this point in the history 
Move farcaster frame functionality to prod
  • Loading branch information
@ginesdt
ginesdt authored Sep 23, 2024
2 parents 8e9b439 + 7558301 commit ed1e34f
Show file tree
Hide file tree
Showing 39 changed files with 3,587 additions and 1,952 deletions.
9 changes: 8 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"@apollo/server": "4.3.0",
"@aws-sdk/client-lambda": "^3.598.0",
"@aws-sdk/credential-providers": "^3.598.0",
"@hono/node-server": "^1.12.0",
"@metamask/eth-sig-util": "5.0.2",
"@react-native-async-storage/async-storage": "^1.23.1",
"@sentry/node": "4.6.6",
Expand All @@ -22,19 +23,24 @@
"buffer": "6.0.3",
"chalk": "2.4.2",
"create-react-class": "15.7.0",
"css-loader": "^7.1.2",
"dataloader": "2.1.0",
"expo-modules-core": "^1.12.15",
"expo-web-browser": "^13.0.3",
"express": "4.18.2",
"frog": "^0.15.7",
"graphql": "16.8.2",
"graphql-fields": "2.0.3",
"graphql-tools": "8.3.14",
"highlight.js": "11.5.1",
"hono": "^4.5.3",
"jquery": "3.6.1",
"jsonwebtoken": "9.0.0",
"jwt-decode": "3.1.2",
"pg": "^8.11.5",
"pg-native": "^3.1.0",
"react": "18.2.0",
"react-datepicker": "^7.3.0",
"react-dom": "18.2.0",
"react-infinite": "0.13.0",
"react-infinite-scroller": "1.2.6",
Expand All @@ -46,6 +52,7 @@
"siwe": "^2.3.2",
"sqlite": "^5.1.1",
"sqlite3": "^5.1.7",
"style-loader": "^4.0.0",
"thirdweb": "5.24.0",
"timeago-react": "3.0.6",
"twitter-api-sdk": "1.2.1",
Expand All @@ -72,7 +79,7 @@
"karma-cljs-test": "0.1.0",
"normalize.css": "8.0.1",
"sass": "1.63.6",
"shadow-cljs": "2.28.9",
"shadow-cljs": "2.28.11",
"string-replace-loader": "^3.1.0",
"truffle": "5.8.1",
"webpack": "5.92.0",
Expand Down
1 change: 1 addition & 0 deletions resources/public/img/layout/icon-clipboard.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/public/img/layout/streamtide-farcaster.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions resources/scss/_base/_utils.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,8 @@
background-color: #666;
}
}

.btBasic:disabled {
pointer-events: none;
background-color: $bgDisabled;
}
9 changes: 7 additions & 2 deletions resources/scss/components/form.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@
border-radius: 7px;
background-color: $bgSite;
}
&::after {
pointer-events: none;
.dropdown-indicator {
position: absolute;
content: "";
top: 50%;
Expand All @@ -91,6 +90,12 @@
background-size: contain;
transform: translateY(-50%);
z-index: 0;
&:hover {
background-image: url('../img/layout/icon-down-arrow-hover.svg');
}
&.dropdown-opened {
transform: translateY(-50%) rotate(180deg);
}
}
}
}
Expand Down
19 changes: 14 additions & 5 deletions resources/scss/components/popUpGrant.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,20 @@
font-size: 16px;
}
}
.popUpContent, .popUpGrant, .popUpSafeLink, .popUpWarn, .popUpRestoreSettings {
.popUpWarn {
.btCancel {
margin-top: 5px;
color: black;
background-color: lightgrey;
&:hover {
background-color: $yellow;
}
}
.btBasic {
font-size: 16px;
}
}
.popUpContent, .popUpGrant, .popUpSafeLink, .popUpWarn, .popUpRestoreSettings, .popUpDeleteCampaign {
width: calc(100% - 42px);
max-width: 490px;
margin: 0 auto;
Expand Down Expand Up @@ -138,10 +151,6 @@
width: 100%;
height: 53px;
line-height: 53px;
&:disabled {
pointer-events: none;
background-color: $bgDisabled;
}
}
&.add {
max-width: 860px;
Expand Down
1 change: 1 addition & 0 deletions resources/scss/components/user.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
position: absolute;
top: 6px;
right: 6px;
z-index: 1;
}
}
}
Expand Down
129 changes: 129 additions & 0 deletions resources/scss/layouts/admin.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,67 @@
background: $bgActiveRound;
}
}
.headerCampaign {
margin-bottom: 30px;
.titleCel {
display: block;
font-weight: $bold;
font-size: 20px;
line-height: 25px;
margin-bottom: 10px;
}
.fieldDescription {
font-weight: bold;
margin-bottom: 10px;
}
.formCampaigns {
padding: 19.86px 15px 18.58px;
.field {
.inputContainer {
margin-left: 15px;
}
}
.creator {
margin-bottom: 12px;
}
}
.btBasic {
width: 100%;
height: 56px;
&:disabled {
pointer-events: none;
background-color: $bgDisabled;
}
}
}
.contentCampaign {
width: 100%;
margin-bottom: 14px;
border-radius: 6px;
position: relative;
overflow: hidden;
background: $bgCard;
padding: 19.86px 15px 18.58px;
max-height: 500px;
.cel {
display: flex;
justify-content: space-between;
}
.data {
width: 100%;
align-items: center;
justify-content: space-between;
h3 {
font-size: 16px;
line-height: 22px;
font-weight: $bold;
}
}
hr {
border-top: 1px solid $lilac;
margin: 0 0 18.84px;
}
}
@include media-breakpoint-down(xs) {
font-size: 14px;
}
Expand Down Expand Up @@ -784,6 +845,74 @@
}
}
}
.headerCampaigns {
margin-bottom: 11.15px;
display: flex;
justify-content: space-between;
padding: 0 18.58px;
.titleCel {
font-size: 18px;
font-weight: $bold;
letter-spacing: 0;
line-height: 25px;
}
.cel {
//width: calc(25% - 8.66px);
text-align: left;
}
.cel-id {
//max-width: 240px;
width: 10%;
text-align: left;
}
.cel-creator {
width: 40%;
//max-width: calc(100% - 527px);
text-align: left;
}
.cel-startdate {
width: 20%;
}
.cel-enddate {
width: 20%;
}
}
.contentCampaign {
margin-bottom: 12px;
border-radius: 6px;
display: flex;
align-items: center;
justify-content: space-between;
.cel {
//width: calc(25% - 8.66px);
}
.id {
width: 10%;
}
.data {
display: flex;
width: 40%;
justify-content: flex-start;
.user {
order: 1;
margin-right: 10px;
}
h3 {
order: 2;
width: auto;
font-size: 20px;
line-height: 26px;
}
}
.startdate {
width: 20%;
text-align: center;
}
.enddate {
width: 20%;
text-align: center;
}
}
}
@include media-breakpoint-up(xl) {
.headerApprovalFeed {
Expand Down
Loading

0 comments on commit ed1e34f

Please sign in to comment.