Skip to content

Commit

Permalink
Merge pull request #292 from NEARBuilders/develop
Browse files Browse the repository at this point in the history
v1.0.0
  • Loading branch information
Megha-Dev-19 authored May 14, 2024
2 parents c9a358a + 9bddac4 commit fd9eb04
Show file tree
Hide file tree
Showing 72 changed files with 2,362 additions and 1,045 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: CI
on:
pull_request:
push:
branches:
- main

jobs:
prettier:
name: Prettier
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20
cache: "yarn"
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Run code formatting check
run: yarn run fmt:check
playwright-tests:
name: Playwright tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20
cache: "yarn"
- name: Install dependencies
run: |
yarn add bos-workspace
npx playwright install-deps
npx playwright install
- name: Run tests
run: |
npx playwright test
26 changes: 0 additions & 26 deletions .github/workflows/quality.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ yarn-error.log*

target
neardev
data.json
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Change Log

## Version v1.0.0 - 2024-05-14

### Features

- Mintbase wallet added to selector. #275
- Integrated google calendar for events. #285
- Import projects from Poltock. #262
- Test button in navbar #289
- Notifications page #282

### Bug Fixes

- Notification component error.

### Refactor and chores

- Code cleanup #276 #279
- Added playwright tests setup #277
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @Megha-Dev-19 @itexpert120 @Jikugodwill @elliotBraem @saadiqbal-dev
- @Megha-Dev-19 @itexpert120 @Jikugodwill @elliotBraem @saadiqbal-dev
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions apps/builddao/bos.config.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"account": "buildhub.near",
"aliases": ["./aliases.mainnet.json"],
"aliases": ["../../aliases.mainnet.json"],
"overrides": {
"testnet": {
"account": "builddao.testnet",
"aliases": ["./aliases.testnet.json"]
"aliases": ["../../aliases.testnet.json"]
}
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
const DaoSDK = VM.require("sdks.near/widget/SDKs.Sputnik.DaoSDK");
const DaoSDK = VM.require("sdks.near/widget/SDKs.Sputnik.DaoSDK") || (() => {});

const { InputField } = VM.require("${config_account}/widget/components") || {
InputField: <></>,
};

if (!DaoSDK) {
return <></>;
}
const [groupsAndMembers, setGroupsAndMembers] = useState([]);
const [selectedRoles, setSelectedRoles] = useState({}); // { role:boolean }
const daoId = props.daoId || "build.sputnik-dao.near";
Expand All @@ -18,6 +16,9 @@ const [message, setMessage] = useState(
const bootstrapTheme = props.bootstrapTheme || "dark";

const sdk = DaoSDK(daoId);
if (!sdk) {
return <></>;
}

const group = sdk.getGroupsAndMembers();
if (group === null || !group.length) {
Expand Down
10 changes: 6 additions & 4 deletions apps/builddao/widget/OnboardingFlow.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ const { Modal, Button, ProgressState } = VM.require(
ProgressState: () => <></>,
};

const DaoSDK = VM.require("sdks.near/widget/SDKs.Sputnik.DaoSDK");
const DaoSDK =
VM.require("sdks.near/widget/SDKs.Sputnik.DaoSDK") || (() => <></>);

const stepsArray = [1, 2, 3];

if (!DaoSDK) {
return <></>;
}
const daoID = "build.sputnik-dao.near";
const sdk = DaoSDK(daoID);

if (!sdk) {
return <></>;
}

const groupMembers = sdk.getMembersByGroupId({ groupId: "community" }) ?? [];

const StorageKey = {
Expand Down
10 changes: 5 additions & 5 deletions apps/builddao/widget/Proposals.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ const { Header } = VM.require("${config_account}/widget/components.Header") || {
};
const DaoSDK = VM.require("sdks.near/widget/SDKs.Sputnik.DaoSDK") || (() => {});

if (!DaoSDK) {
return <></>;
}

const NotificationModalContainer = styled.div`
.pb-4 {
padding-bottom: 0px !important;
Expand All @@ -25,6 +21,10 @@ const sdk = DaoSDK(daoId);
const [currentPage, setCurrentPage] = useState(0);
const accountId = context.accountId;

if (!sdk) {
return <></>;
}

const [showProposalModal, setShowModal] = useState(false);
const [showNotificationModal, setNotificationModal] = useState(false);
const [voteDetails, setVoteDetails] = useState(null);
Expand Down Expand Up @@ -341,7 +341,7 @@ return (
}}
/>
<Header asChild>
<div className="d-flex justify-content-between">
<div className="d-flex justify-content-between w-100 align-items-center">
<h3 className="text-white">Proposals</h3>
<div className="d-flex gap-3">
<Button variant="outline" onClick={() => setFiltersModal(true)}>
Expand Down
21 changes: 0 additions & 21 deletions apps/builddao/widget/TrialAccountBanner.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,6 @@ const { Button, Avatar } = VM.require(
const [loading, setLoading] = useState(false);
const [btnText, setBtnText] = useState("Create Trial Account");

// const TaglineSmall = styled.h2`
// max-width: 700px;

// text-align: center;
// font-size: 1.1rem;
// font-style: normal;
// font-weight: 400;
// line-height: 130%; /* 57.6px */
// margin: 0;

// text-wrap: balance;

// span.muted {
// color: rgba(255, 255, 255, 0.7);
// }

// @media screen and (max-width: 768px) {
// font-size: 1rem;
// }
// `;

const Container = styled.div`
background-color: #000000;
color: #fff;
Expand Down
Loading

0 comments on commit fd9eb04

Please sign in to comment.