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.

Sign up for GitHub

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

Uncomment apps, switch to latest npwd and align lean with qbox #42

Merged
merged 7 commits into from
Feb 11, 2024
Merged

Uncomment apps, switch to latest npwd and align lean with qbox #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
530af94
switch to latest npwd & uncomment qbox apps
TonybynMp4 Dec 3, 2023
21fc807
align qbox-lean with qbox
TonybynMp4 Dec 3, 2023
df3af21
Merge branch 'main' into patch-1
TonybynMp4 Dec 18, 2023
002a0dd
Merge branch 'main' into patch-1
BerkieBb Feb 11, 2024
ece55a5
Update server.cfg
mafewtm Feb 11, 2024
9ef2422
chore(sql): remove unused stuff
BerkieBb Feb 11, 2024
8dda139
chore(recipe): move apps outside of npwd category
BerkieBb Feb 11, 2024
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
49 changes: 41 additions & 8 deletions qbox-lean.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@ tasks:
ref: main
src: https://github.com/qbox-project/safecracker

- action: download_github
- action: download_file
path: ./tmp/screenshot-basic.zip
url: https://github.com/project-error/screenshot-basic/releases/latest/download/screenshot-basic.zip
- action: unzip
dest: ./resources/[standalone]/screenshot-basic
ref: master
src: https://github.com/citizenfx/screenshot-basic
src: ./tmp/screenshot-basic.zip

- action: download_github
dest: ./resources/[standalone]/mhacking
Expand Down Expand Up @@ -214,11 +216,6 @@ tasks:
ref: main
src: https://github.com/qbox-project/qbx_vehiclekeys

- action: download_github
dest: ./resources/[qbx]/qbx_phone
ref: main
src: https://github.com/qbox-project/qbx_phone

- action: download_github
dest: ./resources/[qbx]/qbx_smallresources
ref: main
Expand Down Expand Up @@ -281,6 +278,42 @@ tasks:
ref: main
src: https://github.com/overextended/ox_fuel

# NPWD
- action: download_file
path: ./tmp/npwd.zip
url: https://github.com/project-error/npwd/releases/download/latest/npwd.zip
- action: unzip
dest: ./resources/[npwd]/
src: ./tmp/npwd.zip

- action: query_database
file: ./resources/[npwd]/npwd/import.sql

- action: download_github
dest: ./resources/[npwd]/qbx_npwd
ref: main
src: https://github.com/Qbox-project/qbx_npwd

- action: move_path
src: ./resources/[npwd]/qbx_npwd/config.json
dest: ./resources/[npwd]/npwd/config.json
overwrite: true

- action: download_file
path: ./tmp/npwd_qbx_garages.zip
url: https://github.com/Qbox-project/npwd_qbx_garages/releases/latest/download/npwd_qbx_garages.zip
- action: unzip
dest: ./resources/[npwd-apps]
src: ./tmp/npwd_qbx_garages.zip

- action: download_file
path: ./tmp/npwd_qbx_mail.zip
url: https://github.com/Qbox-project/npwd_qbx_mail/releases/latest/download/npwd_qbx_mail.zip
- action: unzip
dest: ./resources/[npwd-apps]
src: ./tmp/npwd_qbx_mail.zip


# Clean up
- action: remove_path
path: ./tmp
113 changes: 0 additions & 113 deletions qbox.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,6 @@ CREATE TABLE IF NOT EXISTS `bans` (
KEY `ip` (`ip`)
) ENGINE=InnoDB AUTO_INCREMENT=1;

CREATE TABLE IF NOT EXISTS `crypto` (
`crypto` varchar(50) NOT NULL DEFAULT 'qbit',
`worth` int(11) NOT NULL DEFAULT 0,
`history` text DEFAULT NULL,
PRIMARY KEY (`crypto`)
) ENGINE=InnoDB;

CREATE TABLE IF NOT EXISTS `crypto_transactions` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`citizenid` varchar(50) DEFAULT NULL,
`title` varchar(50) DEFAULT NULL,
`message` varchar(50) DEFAULT NULL,
`date` timestamp NULL DEFAULT current_timestamp(),
PRIMARY KEY (`id`),
KEY `citizenid` (`citizenid`)
) ENGINE=InnoDB AUTO_INCREMENT=1;

CREATE TABLE IF NOT EXISTS `dealers` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(50) NOT NULL DEFAULT '0',
Expand Down Expand Up @@ -120,23 +103,6 @@ CREATE TABLE IF NOT EXISTS `occasion_vehicles` (
KEY `occasionId` (`occasionid`)
) ENGINE=InnoDB AUTO_INCREMENT=1;

CREATE TABLE IF NOT EXISTS `phone_invoices` (
`id` int(10) NOT NULL AUTO_INCREMENT,
`citizenid` varchar(50) DEFAULT NULL,
`amount` int(11) NOT NULL DEFAULT 0,
`society` tinytext DEFAULT NULL,
`sender` varchar(50) DEFAULT NULL,
`sendercitizenid` varchar(50) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `citizenid` (`citizenid`)
) ENGINE=InnoDB AUTO_INCREMENT=1;

CREATE TABLE IF NOT EXISTS `phone_gallery` (
`citizenid` VARCHAR(255) NOT NULL ,
`image` VARCHAR(255) NOT NULL ,
`date` timestamp NULL DEFAULT current_timestamp()
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;

CREATE TABLE IF NOT EXISTS `player_mails` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`citizenid` varchar(50) DEFAULT NULL,
Expand All @@ -151,40 +117,6 @@ CREATE TABLE IF NOT EXISTS `player_mails` (
KEY `citizenid` (`citizenid`)
) ENGINE=InnoDB AUTO_INCREMENT=1;

CREATE TABLE IF NOT EXISTS `phone_messages` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`citizenid` varchar(50) DEFAULT NULL,
`number` varchar(50) DEFAULT NULL,
`messages` text DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `citizenid` (`citizenid`),
KEY `number` (`number`)
) ENGINE=InnoDB AUTO_INCREMENT=1;

CREATE TABLE IF NOT EXISTS `phone_tweets` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`citizenid` varchar(50) DEFAULT NULL,
`firstName` varchar(25) DEFAULT NULL,
`lastName` varchar(25) DEFAULT NULL,
`message` text DEFAULT NULL,
`date` datetime DEFAULT current_timestamp(),
`url` text DEFAULT NULL,
`picture` varchar(512) DEFAULT './img/default.png',
`tweetId` varchar(25) NOT NULL,
PRIMARY KEY (`id`),
KEY `citizenid` (`citizenid`)
) ENGINE=InnoDB AUTO_INCREMENT=1;

CREATE TABLE IF NOT EXISTS `player_contacts` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`citizenid` varchar(50) DEFAULT NULL,
`name` varchar(50) DEFAULT NULL,
`number` varchar(50) DEFAULT NULL,
`iban` varchar(50) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `citizenid` (`citizenid`)
) ENGINE=InnoDB AUTO_INCREMENT=1;

CREATE TABLE IF NOT EXISTS `players` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`citizenid` varchar(50) NOT NULL,
Expand Down Expand Up @@ -286,51 +218,6 @@ CREATE TABLE IF NOT EXISTS `player_warns` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1;

CREATE TABLE IF NOT EXISTS `bank_accounts` (
`record_id` bigint(255) NOT NULL AUTO_INCREMENT,
`citizenid` varchar(250) DEFAULT NULL,
`business` varchar(50) DEFAULT NULL,
`businessid` int(11) DEFAULT NULL,
`gangid` varchar(50) DEFAULT NULL,
`amount` bigint(255) NOT NULL DEFAULT 0,
`account_type` enum('Current','Savings','business','Gang') NOT NULL DEFAULT 'Current',
PRIMARY KEY (`record_id`),
UNIQUE KEY `citizenid` (`citizenid`),
KEY `business` (`business`),
KEY `businessid` (`businessid`),
KEY `gangid` (`gangid`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;

CREATE TABLE IF NOT EXISTS `bank_statements` (
`record_id` bigint(255) NOT NULL AUTO_INCREMENT,
`citizenid` varchar(50) DEFAULT NULL,
`account` varchar(50) DEFAULT NULL,
`business` varchar(50) DEFAULT NULL,
`businessid` int(11) DEFAULT NULL,
`gangid` varchar(50) DEFAULT NULL,
`deposited` int(11) DEFAULT NULL,
`withdraw` int(11) DEFAULT NULL,
`balance` int(11) DEFAULT NULL,
`date` varchar(50) DEFAULT NULL,
`type` varchar(255) DEFAULT NULL,
PRIMARY KEY (`record_id`),
KEY `business` (`business`),
KEY `businessid` (`businessid`),
KEY `gangid` (`gangid`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;

CREATE TABLE IF NOT EXISTS `bank_cards` (
`record_id` bigint(255) NOT NULL AUTO_INCREMENT,
`citizenid` varchar(50),
`cardNumber` varchar(50) DEFAULT NULL,
`cardPin` varchar(50) DEFAULT NULL,
`cardActive` tinyint(4) DEFAULT 1,
`cardLocked` tinyint(4) DEFAULT 0,
`cardType` varchar(50) DEFAULT NULL,
PRIMARY KEY (`citizenid`),
KEY `record_id` (`record_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;

CREATE TABLE IF NOT EXISTS `management_funds` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`job_name` VARCHAR(50) NOT NULL,
Expand Down
24 changes: 14 additions & 10 deletions qbox.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ tasks:

- action: waste_time # prevent github throttling
seconds: 10

- action: download_github
dest: ./resources/[qbx]/qbx_lockpick
ref: main
Expand Down Expand Up @@ -440,7 +440,7 @@ tasks:
# NPWD
- action: download_file
path: ./tmp/npwd.zip
url: https://github.com/project-error/npwd/releases/download/3.8.1/npwd.zip
url: https://github.com/project-error/npwd/releases/download/latest/npwd.zip
- action: unzip
dest: ./resources/[npwd]/
src: ./tmp/npwd.zip
Expand All @@ -458,15 +458,19 @@ tasks:
dest: ./resources/[npwd]/npwd/config.json
overwrite: true

#- action: download_github
# dest: ./resources/[npwd]/[npwd-apps]
# ref: main
# src: https://github.com/Qbox-project/npwd_qbx_garages
- action: download_file
path: ./tmp/npwd_qbx_garages.zip
url: https://github.com/Qbox-project/npwd_qbx_garages/releases/latest/download/npwd_qbx_garages.zip
- action: unzip
dest: ./resources/[npwd-apps]
src: ./tmp/npwd_qbx_garages.zip

#- action: download_github
# dest: ./resources/[npwd]/[npwd-apps]
# ref: main
# src: https://github.com/Qbox-project/npwd_qbx_mail
- action: download_file
path: ./tmp/npwd_qbx_mail.zip
url: https://github.com/Qbox-project/npwd_qbx_mail/releases/latest/download/npwd_qbx_mail.zip
- action: unzip
dest: ./resources/[npwd-apps]
src: ./tmp/npwd_qbx_mail.zip

# Clean up
- action: remove_path
Expand Down
2 changes: 1 addition & 1 deletion server.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ ensure [qbx]
ensure [standalone]
ensure [voice]

# ensure [npwd-apps]
ensure [npwd-apps]
ensure qbx_npwd
ensure npwd

Expand Down
Loading